From 80597c41d7b5ea3df9785bf5b483f3c969645ba7 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Wed, 24 May 2006 10:59:28 -0600 Subject: [PATCH] [IA64] GNTMAP_readonly support linux part add read only mapping support. Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c | 14 ++++++-------- linux-2.6-xen-sparse/include/asm-ia64/hypercall.h | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c index b3983263c0..9f2e050c68 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c @@ -314,12 +314,6 @@ gnttab_map_grant_ref_pre(struct gnttab_map_grant_ref *uop) uint32_t flags; flags = uop->flags; - if (flags & GNTMAP_readonly) { -#if 0 - xprintd("GNTMAP_readonly is not supported yet\n"); -#endif - flags &= ~GNTMAP_readonly; - } if (flags & GNTMAP_host_map) { if (flags & GNTMAP_application_map) { @@ -517,6 +511,7 @@ xen_ia64_privcmd_entry_mmap(struct vm_area_struct* vma, int error = 0; struct xen_ia64_privcmd_entry* entry = &privcmd_range->entries[i]; unsigned long gpfn; + unsigned long flags; BUG_ON((addr & ~PAGE_MASK) != 0); BUG_ON(mfn == INVALID_MFN); @@ -527,8 +522,11 @@ xen_ia64_privcmd_entry_mmap(struct vm_area_struct* vma, } gpfn = (privcmd_range->res->start >> PAGE_SHIFT) + i; - error = HYPERVISOR_add_physmap(gpfn, mfn, 0/* prot:XXX */, - domid); + flags = ASSIGN_writable; + if (pgprot_val(prot) == PROT_READ) { + flags = ASSIGN_readonly; + } + error = HYPERVISOR_add_physmap(gpfn, mfn, flags, domid); if (error != 0) { goto out; } diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h index 45f65ebc2a..79bc9c2b9e 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h @@ -494,7 +494,7 @@ HYPERVISOR_zap_physmap(unsigned long gpfn, unsigned int extent_order) static inline unsigned long __HYPERVISOR_add_physmap(unsigned long gpfn, unsigned long mfn, - unsigned int flags, domid_t domid) + unsigned long flags, domid_t domid) { return _hypercall_imm4(unsigned long, ia64_dom0vp_op, IA64_DOM0VP_add_physmap, gpfn, mfn, flags, @@ -503,7 +503,7 @@ __HYPERVISOR_add_physmap(unsigned long gpfn, unsigned long mfn, static inline unsigned long HYPERVISOR_add_physmap(unsigned long gpfn, unsigned long mfn, - unsigned int flags, domid_t domid) + unsigned long flags, domid_t domid) { unsigned long ret = 0; BUG_ON(!running_on_xen);//XXX -- 2.30.2